From b2c5b42e84cb822dae4ae825c77bf7d40c459ca6 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 22 Jun 2004 08:32:33 +0000 Subject: [PATCH] bitkeeper revision 1.994.1.2 (40d7eea14_TQGNAaoZR7aBKoQwz4xQ) Fix nonpriv Linux build. --- linux-2.4.26-xen-sparse/arch/xen/config.in | 4 ++++ linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.26-xen-sparse/arch/xen/config.in index e602de8573..cd1a2278aa 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/config.in +++ b/linux-2.4.26-xen-sparse/arch/xen/config.in @@ -20,6 +20,10 @@ endmenu # The IBM S/390 patch needs this. define_bool CONFIG_NO_IDLE_HZ y +if [ "$CONFIG_XEN_PHYSDEV_ACCESS" != "y" ]; then + define_bool CONFIG_VT n +fi + mainmenu_option next_comment comment 'Code maturity level options' bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU index 8a9fdf2411..7f3b2f6325 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU @@ -266,8 +266,7 @@ CONFIG_BLK_DEV_INITRD=y # # Character devices # -CONFIG_VT=y -CONFIG_VT_CONSOLE=y +# CONFIG_VT is not set # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set -- 2.30.2